textview: port GtkTextView to GskPangoRenderer
authorChristian Hergert <chergert@redhat.com>
Sun, 21 Jul 2019 01:25:51 +0000 (18:25 -0700)
committerChristian Hergert <chergert@redhat.com>
Sun, 21 Jul 2019 23:03:45 +0000 (16:03 -0700)
This removes the use of GtkTextDisplay (a PangoRenderer) to use
the GskPangoRender which generates render nodes. Part of this means
improving the GskPangoRenderer to support the necessary features for
displaying a GtkTextView.

Primarily, this is a merging of GtkTextDisplay features into
GskPangoRender. Additionally, GtkTextDisplay was removed to allow for
gtk_text_layout_snapshot() to be implemented elsewhere.

gtk/gskpango.c
gtk/gskpango.h
gtk/gtktextdisplay.c [deleted file]
gtk/gtktextdisplayprivate.h [deleted file]
gtk/gtktextlayout.c
gtk/gtktextlayoutprivate.h
gtk/gtktextutil.c
gtk/gtktextview.c
gtk/meson.build

index 8e1c2e3f70e209c53f44a487834fadb4d7a40e47..d34d4057a309f12dfbbe992e01cc94ce456a62ed 100644 (file)
 #include "gsk/gskrendernodeprivate.h"
 #include "gskpango.h"
 #include "gtksnapshotprivate.h"
+#include "gtkstylecontextprivate.h"
+#include "gtktextlayoutprivate.h"
+#include "gtktextviewprivate.h"
 
 #include <math.h>
 
 #include <pango/pango.h>
 #include <cairo.h>
 
-#define GSK_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
-#define GSK_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSK_TYPE_PANGO_RENDERER))
-#define GSK_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
-
-/*
- * This is a PangoRenderer implementation that translates all the draw calls to
- * gsk render nodes, using the GtkSnapshot helper class. Glyphs are translated
- * to text nodes, all other draw calls fall back to cairo nodes.
- */
-
-struct _GskPangoRenderer
-{
-  PangoRenderer parent_instance;
-
-  GtkSnapshot *snapshot;
-  GdkRGBA fg_color;
-  graphene_rect_t bounds;
-
-  /* house-keeping options */
-  gboolean is_cached_renderer;
-};
+G_DEFINE_TYPE (GskPangoRenderer, gsk_pango_renderer, PANGO_TYPE_RENDERER)
 
-struct _GskPangoRendererClass
+void
+gsk_pango_renderer_set_state (GskPangoRenderer      *crenderer,
+                              GskPangoRendererState  state)
 {
-  PangoRendererClass parent_class;
-};
+  g_return_if_fail (GSK_IS_PANGO_RENDERER (crenderer));
 
-G_DEFINE_TYPE (GskPangoRenderer, gsk_pango_renderer, PANGO_TYPE_RENDERER)
+  crenderer->state = state;
+}
 
 static void
 get_color (GskPangoRenderer *crenderer,
@@ -158,15 +143,14 @@ gsk_pango_renderer_draw_rectangle (PangoRenderer     *renderer,
 {
   GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer);
   GdkRGBA rgba;
-  graphene_rect_t bounds;
 
   get_color (crenderer, part, &rgba);
-
-  graphene_rect_init (&bounds,
-                      (double)x / PANGO_SCALE, (double)y / PANGO_SCALE,
-                      (double)width / PANGO_SCALE, (double)height / PANGO_SCALE);
-
-  gtk_snapshot_append_color (crenderer->snapshot, &rgba, &bounds);
+  gtk_snapshot_append_color (crenderer->snapshot,
+                             &rgba,
+                             &GRAPHENE_RECT_INIT ((double)x / PANGO_SCALE,
+                                                  (double)y / PANGO_SCALE,
+                                                  (double)width / PANGO_SCALE,
+                                                  (double)height / PANGO_SCALE));
 }
 
 static void
@@ -336,6 +320,124 @@ gsk_pango_renderer_draw_shape (PangoRenderer  *renderer,
   cairo_destroy (cr);
 }
 
+static void
+text_renderer_set_rgba (GskPangoRenderer *crenderer,
+                        PangoRenderPart   part,
+                        const GdkRGBA    *rgba)
+{
+  PangoRenderer *renderer = PANGO_RENDERER (crenderer);
+  PangoColor color = { 0, };
+  guint16 alpha;
+
+  if (rgba)
+    {
+      color.red = (guint16)(rgba->red * 65535);
+      color.green = (guint16)(rgba->green * 65535);
+      color.blue = (guint16)(rgba->blue * 65535);
+      alpha = (guint16)(rgba->alpha * 65535);
+      pango_renderer_set_color (renderer, part, &color);
+      pango_renderer_set_alpha (renderer, part, alpha);
+    }
+  else
+    {
+      pango_renderer_set_color (renderer, part, NULL);
+      pango_renderer_set_alpha (renderer, part, 0);
+    }
+}
+
+static GtkTextAppearance *
+get_item_appearance (PangoItem *item)
+{
+  GSList *tmp_list = item->analysis.extra_attrs;
+
+  while (tmp_list)
+    {
+      PangoAttribute *attr = tmp_list->data;
+
+      if (attr->klass->type == gtk_text_attr_appearance_type)
+        return &((GtkTextAttrAppearance *)attr)->appearance;
+
+      tmp_list = tmp_list->next;
+    }
+
+  return NULL;
+}
+
+static void
+gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
+                                PangoLayoutRun *run)
+{
+  GtkStyleContext *context;
+  GskPangoRenderer *crenderer = GSK_PANGO_RENDERER (renderer);
+  GdkRGBA *bg_rgba = NULL;
+  GdkRGBA *fg_rgba = NULL;
+  GtkTextAppearance *appearance;
+
+  PANGO_RENDERER_CLASS (gsk_pango_renderer_parent_class)->prepare_run (renderer, run);
+
+  appearance = get_item_appearance (run->item);
+
+  if (appearance == NULL)
+    return;
+
+  context = gtk_widget_get_style_context (crenderer->widget);
+
+  if (appearance->draw_bg && crenderer->state == GSK_PANGO_RENDERER_NORMAL)
+    bg_rgba = appearance->bg_rgba;
+  else
+    bg_rgba = NULL;
+
+  text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_BACKGROUND, bg_rgba);
+
+  if (crenderer->state == GSK_PANGO_RENDERER_SELECTED &&
+      GTK_IS_TEXT_VIEW (crenderer->widget))
+    {
+      GtkCssNode *selection_node;
+
+      selection_node = gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget);
+      gtk_style_context_save_to_node (context, selection_node);
+
+      gtk_style_context_get (context,
+                             "color", &fg_rgba,
+                             NULL);
+
+      gtk_style_context_restore (context);
+    }
+  else if (crenderer->state == GSK_PANGO_RENDERER_CURSOR && gtk_widget_has_focus (crenderer->widget))
+    {
+      gtk_style_context_get (context,
+                             "background-color", &fg_rgba,
+                             NULL);
+    }
+  else
+    fg_rgba = appearance->fg_rgba;
+
+  text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_FOREGROUND, fg_rgba);
+
+  if (appearance->strikethrough_rgba)
+    text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_STRIKETHROUGH, appearance->strikethrough_rgba);
+  else
+    text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_STRIKETHROUGH, fg_rgba);
+
+  if (appearance->underline_rgba)
+    text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_UNDERLINE, appearance->underline_rgba);
+  else if (appearance->underline == PANGO_UNDERLINE_ERROR)
+    {
+      if (!crenderer->error_color)
+        {
+          static const GdkRGBA red = { 1, 0, 0, 1 };
+          crenderer->error_color = gdk_rgba_copy (&red);
+        }
+
+      text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_UNDERLINE, crenderer->error_color);
+    }
+  else
+    text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_UNDERLINE, fg_rgba);
+
+  if (fg_rgba != appearance->fg_rgba)
+    gdk_rgba_free (fg_rgba);
+}
+
 static void
 gsk_pango_renderer_init (GskPangoRenderer *renderer G_GNUC_UNUSED)
 {
@@ -352,13 +454,14 @@ gsk_pango_renderer_class_init (GskPangoRendererClass *klass)
   renderer_class->draw_trapezoid = gsk_pango_renderer_draw_trapezoid;
   renderer_class->draw_error_underline = gsk_pango_renderer_draw_error_underline;
   renderer_class->draw_shape = gsk_pango_renderer_draw_shape;
+  renderer_class->prepare_run = gsk_pango_renderer_prepare_run;
 }
 
 static GskPangoRenderer *cached_renderer = NULL; /* MT-safe */
 G_LOCK_DEFINE_STATIC (cached_renderer);
 
-static GskPangoRenderer *
-acquire_renderer (void)
+GskPangoRenderer *
+gsk_pango_renderer_acquire (void)
 {
   GskPangoRenderer *renderer;
 
@@ -380,13 +483,20 @@ acquire_renderer (void)
   return renderer;
 }
 
-static void
-release_renderer (GskPangoRenderer *renderer)
+void
+gsk_pango_renderer_release (GskPangoRenderer *renderer)
 {
   if (G_LIKELY (renderer->is_cached_renderer))
     {
+      renderer->widget = NULL;
       renderer->snapshot = NULL;
 
+      if (renderer->error_color)
+        {
+          gdk_rgba_free (renderer->error_color);
+          renderer->error_color = NULL;
+        }
+
       G_UNLOCK (cached_renderer);
     }
   else
@@ -414,7 +524,7 @@ gtk_snapshot_append_layout (GtkSnapshot   *snapshot,
   g_return_if_fail (snapshot != NULL);
   g_return_if_fail (PANGO_IS_LAYOUT (layout));
 
-  crenderer = acquire_renderer ();
+  crenderer = gsk_pango_renderer_acquire ();
 
   crenderer->snapshot = snapshot;
   crenderer->fg_color = *color;
@@ -424,5 +534,5 @@ gtk_snapshot_append_layout (GtkSnapshot   *snapshot,
 
   pango_renderer_draw_layout (PANGO_RENDERER (crenderer), layout, 0, 0);
 
-  release_renderer (crenderer);
+  gsk_pango_renderer_release (crenderer);
 }
index a97fdebea4f6f0e31a3f3eebec416944aa35a4a3..33ebff422a1863863dd998edce85920877595913 100644 (file)
 
 G_BEGIN_DECLS
 
-#define GSK_TYPE_PANGO_RENDERER (gsk_pango_renderer_get_type ())
+#define GSK_TYPE_PANGO_RENDERER            (gsk_pango_renderer_get_type ())
+#define GSK_PANGO_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRenderer))
+#define GSK_IS_PANGO_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSK_TYPE_PANGO_RENDERER))
+#define GSK_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
+#define GSK_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSK_TYPE_PANGO_RENDERER))
+#define GSK_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
 
-#define GSK_PANGO_RENDERER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRenderer))
-#define GSK_IS_PANGO_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSK_TYPE_PANGO_RENDERER))
+typedef struct _GskPangoRenderer      GskPangoRenderer;
+typedef struct _GskPangoRendererClass GskPangoRendererClass;
 
-typedef struct _GskPangoRenderer        GskPangoRenderer;
-typedef struct _GskPangoRendererClass   GskPangoRendererClass;
+typedef enum
+{
+  GSK_PANGO_RENDERER_NORMAL,
+  GSK_PANGO_RENDERER_SELECTED,
+  GSK_PANGO_RENDERER_CURSOR
+} GskPangoRendererState;
 
-GType gsk_pango_renderer_get_type (void) G_GNUC_CONST;
+/*
+ * This is a PangoRenderer implementation that translates all the draw calls to
+ * gsk render nodes, using the GtkSnapshot helper class. Glyphs are translated
+ * to text nodes, all other draw calls fall back to cairo nodes.
+ */
+
+struct _GskPangoRenderer
+{
+  PangoRenderer          parent_instance;
+
+  GtkWidget             *widget;
+  GtkSnapshot           *snapshot;
+  GdkRGBA                fg_color;
+  graphene_rect_t        bounds;
+
+  /* Error underline color for this widget */
+  GdkRGBA               *error_color;
+
+  GskPangoRendererState  state;
+
+  /* house-keeping options */
+  guint                  is_cached_renderer : 1;
+};
+
+struct _GskPangoRendererClass
+{
+  PangoRendererClass parent_class;
+};
+
+GType             gsk_pango_renderer_get_type  (void) G_GNUC_CONST;
+void              gsk_pango_renderer_set_state (GskPangoRenderer      *crenderer,
+                                                GskPangoRendererState  state);
+GskPangoRenderer *gsk_pango_renderer_acquire   (void);
+void              gsk_pango_renderer_release   (GskPangoRenderer      *crenderer);
 
 G_END_DECLS
 
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
deleted file mode 100644 (file)
index 9c2dae9..0000000
+++ /dev/null
@@ -1,932 +0,0 @@
-/* gtktextdisplay.c - display layed-out text
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000 Red Hat, Inc.
- * Tk->Gtk port by Havoc Pennington
- *
- * This file can be used under your choice of two licenses, the LGPL
- * and the original Tk license.
- *
- * LGPL:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.Free
- *
- * Original Tk license:
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#include "config.h"
-#include "gtktextdisplayprivate.h"
-#include "gtktextviewprivate.h"
-#include "gtkwidgetprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkintl.h"
-#include <gdk/gdktextureprivate.h>
-
-#define GTK_TYPE_TEXT_RENDERER            (_gtk_text_renderer_get_type())
-#define GTK_TEXT_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_TEXT_RENDERER, GtkTextRenderer))
-#define GTK_IS_TEXT_RENDERER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_TEXT_RENDERER))
-#define GTK_TEXT_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_RENDERER, GtkTextRendererClass))
-#define GTK_IS_TEXT_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_RENDERER))
-#define GTK_TEXT_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_RENDERER, GtkTextRendererClass))
-
-typedef struct _GtkTextRenderer      GtkTextRenderer;
-typedef struct _GtkTextRendererClass GtkTextRendererClass;
-
-enum {
-  NORMAL,
-  SELECTED,
-  CURSOR
-};
-
-struct _GtkTextRenderer
-{
-  PangoRenderer parent_instance;
-
-  GtkWidget *widget;
-  cairo_t *cr;
-
-  GdkRGBA *error_color;        /* Error underline color for this widget */
-  GList *widgets;              /* widgets encountered when drawing */
-
-  guint state : 2;
-};
-
-struct _GtkTextRendererClass
-{
-  PangoRendererClass parent_class;
-};
-
-GType _gtk_text_renderer_get_type (void);
-
-G_DEFINE_TYPE (GtkTextRenderer, _gtk_text_renderer, PANGO_TYPE_RENDERER)
-
-static void
-text_renderer_set_rgba (GtkTextRenderer *text_renderer,
-                       PangoRenderPart  part,
-                       const GdkRGBA   *rgba)
-{
-  PangoRenderer *renderer = PANGO_RENDERER (text_renderer);
-  PangoColor color = { 0, };
-  guint16 alpha;
-
-  if (rgba)
-    {
-      color.red = (guint16)(rgba->red * 65535);
-      color.green = (guint16)(rgba->green * 65535);
-      color.blue = (guint16)(rgba->blue * 65535);
-      alpha = (guint16)(rgba->alpha * 65535);
-      pango_renderer_set_color (renderer, part, &color);
-      pango_renderer_set_alpha (renderer, part, alpha);
-    }
-  else
-    {
-      pango_renderer_set_color (renderer, part, NULL);
-      pango_renderer_set_alpha (renderer, part, 0);
-    }
-}
-
-static GtkTextAppearance *
-get_item_appearance (PangoItem *item)
-{
-  GSList *tmp_list = item->analysis.extra_attrs;
-
-  while (tmp_list)
-    {
-      PangoAttribute *attr = tmp_list->data;
-
-      if (attr->klass->type == gtk_text_attr_appearance_type)
-       return &((GtkTextAttrAppearance *)attr)->appearance;
-
-      tmp_list = tmp_list->next;
-    }
-
-  return NULL;
-}
-
-static void
-gtk_text_renderer_prepare_run (PangoRenderer  *renderer,
-                              PangoLayoutRun *run)
-{
-  GtkStyleContext *context;
-  GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
-  GdkRGBA *bg_rgba = NULL;
-  GdkRGBA *fg_rgba = NULL;
-  GtkTextAppearance *appearance;
-
-  PANGO_RENDERER_CLASS (_gtk_text_renderer_parent_class)->prepare_run (renderer, run);
-
-  appearance = get_item_appearance (run->item);
-  g_assert (appearance != NULL);
-
-  context = gtk_widget_get_style_context (text_renderer->widget);
-
-  if (appearance->draw_bg && text_renderer->state == NORMAL)
-    bg_rgba = appearance->bg_rgba;
-  else
-    bg_rgba = NULL;
-
-  text_renderer_set_rgba (text_renderer, PANGO_RENDER_PART_BACKGROUND, bg_rgba);
-
-  if (text_renderer->state == SELECTED)
-    {
-      GtkCssNode *selection_node;
-
-      selection_node = gtk_text_view_get_selection_node ((GtkTextView *)text_renderer->widget);
-      gtk_style_context_save_to_node (context, selection_node);
-
-      gtk_style_context_get (context,
-                             "color", &fg_rgba,
-                             NULL);
-
-      gtk_style_context_restore (context);
-    }
-  else if (text_renderer->state == CURSOR && gtk_widget_has_focus (text_renderer->widget))
-    {
-      gtk_style_context_get (context,
-                             "background-color", &fg_rgba,
-                              NULL);
-    }
-  else
-    fg_rgba = appearance->fg_rgba;
-
-  text_renderer_set_rgba (text_renderer, PANGO_RENDER_PART_FOREGROUND, fg_rgba);
-
-  if (appearance->strikethrough_rgba)
-    text_renderer_set_rgba (text_renderer, PANGO_RENDER_PART_STRIKETHROUGH, appearance->strikethrough_rgba);
-  else
-    text_renderer_set_rgba (text_renderer, PANGO_RENDER_PART_STRIKETHROUGH, fg_rgba);
-
-  if (appearance->underline_rgba)
-    text_renderer_set_rgba (text_renderer, PANGO_RENDER_PART_UNDERLINE, appearance->underline_rgba);
-  else if (appearance->underline == PANGO_UNDERLINE_ERROR)
-    {
-      if (!text_renderer->error_color)
-        {
-          static const GdkRGBA red = { 1, 0, 0, 1 };
-          text_renderer->error_color = gdk_rgba_copy (&red);
-        }
-
-      text_renderer_set_rgba (text_renderer, PANGO_RENDER_PART_UNDERLINE, text_renderer->error_color);
-    }
-  else
-    text_renderer_set_rgba (text_renderer, PANGO_RENDER_PART_UNDERLINE, fg_rgba);
-
-  if (fg_rgba != appearance->fg_rgba)
-    gdk_rgba_free (fg_rgba);
-}
-
-static void
-set_color (GtkTextRenderer *text_renderer,
-           PangoRenderPart  part)
-{
-  PangoColor *color;
-  GdkRGBA rgba;
-  guint16 alpha;
-
-  cairo_save (text_renderer->cr);
-
-  color = pango_renderer_get_color (PANGO_RENDERER (text_renderer), part);
-  alpha = pango_renderer_get_alpha (PANGO_RENDERER (text_renderer), part);
-  if (color)
-    {
-      rgba.red = color->red / 65535.;
-      rgba.green = color->green / 65535.;
-      rgba.blue = color->blue / 65535.;
-      rgba.alpha = alpha / 65535.;
-      gdk_cairo_set_source_rgba (text_renderer->cr, &rgba);
-    }
-}
-
-static void
-unset_color (GtkTextRenderer *text_renderer)
-{
-  cairo_restore (text_renderer->cr);
-}
-
-static void
-gtk_text_renderer_draw_glyphs (PangoRenderer     *renderer,
-                               PangoFont         *font,
-                               PangoGlyphString  *glyphs,
-                               int                x,
-                               int                y)
-{
-  GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
-
-  set_color (text_renderer, PANGO_RENDER_PART_FOREGROUND);
-
-  cairo_move_to (text_renderer->cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE);
-  pango_cairo_show_glyph_string (text_renderer->cr, font, glyphs);
-
-  unset_color (text_renderer);
-}
-
-static void
-gtk_text_renderer_draw_glyph_item (PangoRenderer     *renderer,
-                                   const char        *text,
-                                   PangoGlyphItem    *glyph_item,
-                                   int                x,
-                                   int                y)
-{
-  GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
-
-  set_color (text_renderer, PANGO_RENDER_PART_FOREGROUND);
-
-  cairo_move_to (text_renderer->cr, (double)x / PANGO_SCALE, (double)y / PANGO_SCALE);
-  pango_cairo_show_glyph_item (text_renderer->cr, text, glyph_item);
-
-  unset_color (text_renderer);
-}
-
-static void
-gtk_text_renderer_draw_rectangle (PangoRenderer     *renderer,
-                                 PangoRenderPart    part,
-                                 int                x,
-                                 int                y,
-                                 int                width,
-                                 int                height)
-{
-  GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
-
-  set_color (text_renderer, part);
-
-  cairo_rectangle (text_renderer->cr,
-                   (double)x / PANGO_SCALE, (double)y / PANGO_SCALE,
-                  (double)width / PANGO_SCALE, (double)height / PANGO_SCALE);
-  cairo_fill (text_renderer->cr);
-
-  unset_color (text_renderer);
-}
-
-static void
-gtk_text_renderer_draw_trapezoid (PangoRenderer     *renderer,
-                                 PangoRenderPart    part,
-                                 double             y1_,
-                                 double             x11,
-                                 double             x21,
-                                 double             y2,
-                                 double             x12,
-                                 double             x22)
-{
-  GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
-  cairo_t *cr;
-  cairo_matrix_t matrix;
-
-  set_color (text_renderer, part);
-
-  cr = text_renderer->cr;
-
-  cairo_get_matrix (cr, &matrix);
-  matrix.xx = matrix.yy = 1.0;
-  matrix.xy = matrix.yx = 0.0;
-  cairo_set_matrix (cr, &matrix);
-
-  cairo_move_to (cr, x11, y1_);
-  cairo_line_to (cr, x21, y1_);
-  cairo_line_to (cr, x22, y2);
-  cairo_line_to (cr, x12, y2);
-  cairo_close_path (cr);
-
-  cairo_fill (cr);
-
-  unset_color (text_renderer);
-}
-
-static void
-gtk_text_renderer_draw_error_underline (PangoRenderer *renderer,
-                                       int            x,
-                                       int            y,
-                                       int            width,
-                                       int            height)
-{
-  GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
-
-  set_color (text_renderer, PANGO_RENDER_PART_UNDERLINE);
-
-  pango_cairo_show_error_underline (text_renderer->cr,
-                                    (double)x / PANGO_SCALE, (double)y / PANGO_SCALE,
-                                    (double)width / PANGO_SCALE, (double)height / PANGO_SCALE);
-
-  unset_color (text_renderer);
-}
-
-static void
-gtk_text_renderer_draw_shape (PangoRenderer   *renderer,
-                             PangoAttrShape  *attr,
-                             int              x,
-                             int              y)
-{
-  GtkTextRenderer *text_renderer = GTK_TEXT_RENDERER (renderer);
-
-  if (attr->data == NULL)
-    {
-      /* This happens if we have an empty widget anchor. Draw
-       * something empty-looking.
-       */
-      GdkRectangle shape_rect;
-      cairo_t *cr;
-
-      shape_rect.x = PANGO_PIXELS (x);
-      shape_rect.y = PANGO_PIXELS (y + attr->logical_rect.y);
-      shape_rect.width = PANGO_PIXELS (x + attr->logical_rect.width) - shape_rect.x;
-      shape_rect.height = PANGO_PIXELS (y + attr->logical_rect.y + attr->logical_rect.height) - shape_rect.y;
-
-      set_color (text_renderer, PANGO_RENDER_PART_FOREGROUND);
-
-      cr = text_renderer->cr;
-
-      cairo_set_line_width (cr, 1.0);
-
-      cairo_rectangle (cr,
-                       shape_rect.x + 0.5, shape_rect.y + 0.5,
-                       shape_rect.width - 1, shape_rect.height - 1);
-      cairo_move_to (cr, shape_rect.x + 0.5, shape_rect.y + 0.5);
-      cairo_line_to (cr, 
-                     shape_rect.x + shape_rect.width - 0.5,
-                     shape_rect.y + shape_rect.height - 0.5);
-      cairo_move_to (cr, shape_rect.x + 0.5,
-                     shape_rect.y + shape_rect.height - 0.5);
-      cairo_line_to (cr, shape_rect.x + shape_rect.width - 0.5,
-                     shape_rect.y + 0.5);
-
-      cairo_stroke (cr);
-
-      unset_color (text_renderer);
-    }
-  else if (GDK_IS_TEXTURE (attr->data))
-    {
-      cairo_t *cr = text_renderer->cr;
-      GdkTexture *texture = GDK_TEXTURE (attr->data);
-      cairo_surface_t *surface;
-
-      surface = gdk_texture_download_surface (texture);
-
-      cairo_save (cr);
-
-      cairo_set_source_surface (cr, surface,
-                                PANGO_PIXELS (x),
-                                PANGO_PIXELS (y) -  gdk_texture_get_height (texture));
-      cairo_paint (cr);
-
-      cairo_restore (cr);
-
-      cairo_surface_destroy (surface);
-    }
-  else if (GTK_IS_WIDGET (attr->data))
-    {
-      GtkWidget *widget;
-      
-      widget = GTK_WIDGET (attr->data);
-
-      text_renderer->widgets = g_list_prepend (text_renderer->widgets,
-                                              g_object_ref (widget));
-    }
-  else
-    g_assert_not_reached (); /* not a texture or widget */
-}
-
-static void
-gtk_text_renderer_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (_gtk_text_renderer_parent_class)->finalize (object);
-}
-
-static void
-_gtk_text_renderer_init (GtkTextRenderer *renderer)
-{
-}
-
-static void
-_gtk_text_renderer_class_init (GtkTextRendererClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  
-  PangoRendererClass *renderer_class = PANGO_RENDERER_CLASS (klass);
-  
-  renderer_class->prepare_run = gtk_text_renderer_prepare_run;
-  renderer_class->draw_glyphs = gtk_text_renderer_draw_glyphs;
-  renderer_class->draw_glyph_item = gtk_text_renderer_draw_glyph_item;
-  renderer_class->draw_rectangle = gtk_text_renderer_draw_rectangle;
-  renderer_class->draw_trapezoid = gtk_text_renderer_draw_trapezoid;
-  renderer_class->draw_error_underline = gtk_text_renderer_draw_error_underline;
-  renderer_class->draw_shape = gtk_text_renderer_draw_shape;
-
-  object_class->finalize = gtk_text_renderer_finalize;
-}
-
-static void
-text_renderer_set_state (GtkTextRenderer *text_renderer,
-                        int              state)
-{
-  text_renderer->state = state;
-}
-
-static void
-text_renderer_begin (GtkTextRenderer *text_renderer,
-                     GtkWidget       *widget,
-                     cairo_t         *cr)
-{
-  GtkStyleContext *context;
-  GdkRGBA color;
-  GtkCssNode *text_node;
-
-  text_renderer->widget = widget;
-  text_renderer->cr = cr;
-
-  context = gtk_widget_get_style_context (widget);
-
-  text_node = gtk_text_view_get_text_node ((GtkTextView *)widget);
-  gtk_style_context_save_to_node (context, text_node);
-
-  gtk_style_context_get_color (context, &color);
-
-  cairo_save (cr);
-
-  gdk_cairo_set_source_rgba (cr, &color);
-}
-
-/* Returns a GSList of (referenced) widgets encountered while drawing.
- */
-static void
-text_renderer_end (GtkTextRenderer *text_renderer)
-{
-  GtkStyleContext *context;
-
-  cairo_restore (text_renderer->cr);
-
-  context = gtk_widget_get_style_context (text_renderer->widget);
-
-  gtk_style_context_restore (context);
-
-  text_renderer->widget = NULL;
-  text_renderer->cr = NULL;
-
-  if (text_renderer->error_color)
-    {
-      gdk_rgba_free (text_renderer->error_color);
-      text_renderer->error_color = NULL;
-    }
-}
-
-static cairo_region_t *
-get_selected_clip (GtkTextRenderer    *text_renderer,
-                   PangoLayout        *layout,
-                   PangoLayoutLine    *line,
-                   int                 x,
-                   int                 y,
-                   int                 height,
-                   int                 start_index,
-                   int                 end_index)
-{
-  gint *ranges;
-  gint n_ranges, i;
-  cairo_region_t *clip_region = cairo_region_create ();
-
-  pango_layout_line_get_x_ranges (line, start_index, end_index, &ranges, &n_ranges);
-
-  for (i=0; i < n_ranges; i++)
-    {
-      GdkRectangle rect;
-
-      rect.x = x + PANGO_PIXELS (ranges[2*i]);
-      rect.y = y;
-      rect.width = PANGO_PIXELS (ranges[2*i + 1]) - PANGO_PIXELS (ranges[2*i]);
-      rect.height = height;
-      
-      cairo_region_union_rectangle (clip_region, &rect);
-    }
-
-  g_free (ranges);
-  return clip_region;
-}
-
-static void
-render_para (GtkTextRenderer    *text_renderer,
-             GtkTextLineDisplay *line_display,
-             int                 selection_start_index,
-             int                 selection_end_index)
-{
-  GtkStyleContext *context;
-  PangoLayout *layout = line_display->layout;
-  int byte_offset = 0;
-  PangoLayoutIter *iter;
-  int screen_width;
-  GdkRGBA *selection;
-  gboolean first = TRUE;
-  GtkCssNode *selection_node;
-
-  iter = pango_layout_get_iter (layout);
-  screen_width = line_display->total_width;
-
-  context = gtk_widget_get_style_context (text_renderer->widget);
-  selection_node = gtk_text_view_get_selection_node ((GtkTextView*)text_renderer->widget);
-  gtk_style_context_save_to_node (context, selection_node);
-
-  gtk_style_context_get (context, "background-color", &selection, NULL);
-
-  gtk_style_context_restore (context);
-
-  do
-    {
-      PangoLayoutLine *line = pango_layout_iter_get_line_readonly (iter);
-      int selection_y, selection_height;
-      int first_y, last_y;
-      PangoRectangle line_rect;
-      int baseline;
-      gboolean at_last_line;
-      
-      pango_layout_iter_get_line_extents (iter, NULL, &line_rect);
-      baseline = pango_layout_iter_get_baseline (iter);
-      pango_layout_iter_get_line_yrange (iter, &first_y, &last_y);
-      
-      /* Adjust for margins */
-
-      line_rect.x += line_display->x_offset * PANGO_SCALE;
-      line_rect.y += line_display->top_margin * PANGO_SCALE;
-      baseline += line_display->top_margin * PANGO_SCALE;
-
-      /* Selection is the height of the line, plus top/bottom
-       * margin if we're the first/last line
-       */
-      selection_y = PANGO_PIXELS (first_y) + line_display->top_margin;
-      selection_height = PANGO_PIXELS (last_y) - PANGO_PIXELS (first_y);
-
-      if (first)
-        {
-          selection_y -= line_display->top_margin;
-          selection_height += line_display->top_margin;
-        }
-
-      at_last_line = pango_layout_iter_at_last_line (iter);
-      if (at_last_line)
-        selection_height += line_display->bottom_margin;
-      
-      first = FALSE;
-
-      if (selection_start_index < byte_offset &&
-          selection_end_index > line->length + byte_offset) /* All selected */
-        {
-          cairo_t *cr = text_renderer->cr;
-
-          cairo_save (cr);
-          gdk_cairo_set_source_rgba (cr, selection);
-          cairo_rectangle (cr, 
-                           line_display->left_margin, selection_y,
-                           screen_width, selection_height);
-          cairo_fill (cr);
-          cairo_restore(cr);
-
-         text_renderer_set_state (text_renderer, SELECTED);
-         pango_renderer_draw_layout_line (PANGO_RENDERER (text_renderer),
-                                          line, 
-                                          line_rect.x,
-                                          baseline);
-        }
-      else
-        {
-          if (line_display->pg_bg_rgba_set)
-            {
-              cairo_t *cr = text_renderer->cr;
-
-              cairo_save (cr);
-              gdk_cairo_set_source_rgba (text_renderer->cr, &line_display->pg_bg_rgba);
-              cairo_rectangle (cr, 
-                               line_display->left_margin, selection_y,
-                               screen_width, selection_height);
-              cairo_fill (cr);
-
-              cairo_restore (cr);
-            }
-        
-         text_renderer_set_state (text_renderer, NORMAL);
-         pango_renderer_draw_layout_line (PANGO_RENDERER (text_renderer),
-                                          line, 
-                                          line_rect.x,
-                                          baseline);
-
-         /* Check if some part of the line is selected; the newline
-          * that is after line->length for the last line of the
-          * paragraph counts as part of the line for this
-          */
-          if ((selection_start_index < byte_offset + line->length ||
-              (selection_start_index == byte_offset + line->length && pango_layout_iter_at_last_line (iter))) &&
-             selection_end_index > byte_offset)
-            {
-              cairo_t *cr = text_renderer->cr;
-              cairo_region_t *clip_region = get_selected_clip (text_renderer, layout, line,
-                                                          line_display->x_offset,
-                                                          selection_y,
-                                                          selection_height,
-                                                          selection_start_index, selection_end_index);
-
-              cairo_save (cr);
-              gdk_cairo_region (cr, clip_region);
-              cairo_clip (cr);
-              cairo_region_destroy (clip_region);
-
-              gdk_cairo_set_source_rgba (cr, selection);
-              cairo_rectangle (cr,
-                               PANGO_PIXELS (line_rect.x),
-                               selection_y,
-                               PANGO_PIXELS (line_rect.width),
-                               selection_height);
-              cairo_fill (cr);
-
-             text_renderer_set_state (text_renderer, SELECTED);
-             pango_renderer_draw_layout_line (PANGO_RENDERER (text_renderer),
-                                              line, 
-                                              line_rect.x,
-                                              baseline);
-
-              cairo_restore (cr);
-
-              /* Paint in the ends of the line */
-              if (line_rect.x > line_display->left_margin * PANGO_SCALE &&
-                  ((line_display->direction == GTK_TEXT_DIR_LTR && selection_start_index < byte_offset) ||
-                   (line_display->direction == GTK_TEXT_DIR_RTL && selection_end_index > byte_offset + line->length)))
-                {
-                  cairo_save (cr);
-
-                  gdk_cairo_set_source_rgba (cr, selection);
-                  cairo_rectangle (cr,
-                                   line_display->left_margin,
-                                   selection_y,
-                                   PANGO_PIXELS (line_rect.x) - line_display->left_margin,
-                                   selection_height);
-                  cairo_fill (cr);
-
-                  cairo_restore (cr);
-                }
-
-              if (line_rect.x + line_rect.width <
-                  (screen_width + line_display->left_margin) * PANGO_SCALE &&
-                  ((line_display->direction == GTK_TEXT_DIR_LTR && selection_end_index > byte_offset + line->length) ||
-                   (line_display->direction == GTK_TEXT_DIR_RTL && selection_start_index < byte_offset)))
-                {
-                  int nonlayout_width;
-
-                  nonlayout_width =
-                    line_display->left_margin + screen_width -
-                    PANGO_PIXELS (line_rect.x) - PANGO_PIXELS (line_rect.width);
-
-                  cairo_save (cr);
-
-                  gdk_cairo_set_source_rgba (cr, selection);
-                  cairo_rectangle (cr,
-                                   PANGO_PIXELS (line_rect.x) + PANGO_PIXELS (line_rect.width),
-                                   selection_y,
-                                   nonlayout_width,
-                                   selection_height);
-                  cairo_fill (cr);
-
-                  cairo_restore (cr);
-                }
-            }
-         else if (line_display->has_block_cursor &&
-                  gtk_widget_has_focus (text_renderer->widget) &&
-                  byte_offset <= line_display->insert_index &&
-                  (line_display->insert_index < byte_offset + line->length ||
-                   (at_last_line && line_display->insert_index == byte_offset + line->length)))
-           {
-             GdkRectangle cursor_rect;
-              GdkRGBA cursor_color;
-              cairo_t *cr = text_renderer->cr;
-
-              /* we draw text using base color on filled cursor rectangle of cursor color
-               * (normally white on black) */
-              _gtk_style_context_get_cursor_color (context, &cursor_color, NULL);
-
-             cursor_rect.x = line_display->x_offset + line_display->block_cursor.x;
-             cursor_rect.y = line_display->block_cursor.y + line_display->top_margin;
-             cursor_rect.width = line_display->block_cursor.width;
-             cursor_rect.height = line_display->block_cursor.height;
-
-              cairo_save (cr);
-
-              gdk_cairo_rectangle (cr, &cursor_rect);
-              cairo_clip (cr);
-
-              gdk_cairo_set_source_rgba (cr, &cursor_color);
-              cairo_paint (cr);
-
-              /* draw text under the cursor if any */
-              if (!line_display->cursor_at_line_end)
-                {
-                  GdkRGBA *color;
-
-                  gtk_style_context_get (context, "background-color", &color, NULL);
-
-                  gdk_cairo_set_source_rgba (cr, color);
-
-                 text_renderer_set_state (text_renderer, CURSOR);
-
-                 pango_renderer_draw_layout_line (PANGO_RENDERER (text_renderer),
-                                                  line,
-                                                  line_rect.x,
-                                                  baseline);
-                  gdk_rgba_free (color);
-                }
-
-              cairo_restore (cr);
-           }
-        }
-
-      byte_offset += line->length;
-    }
-  while (pango_layout_iter_next_line (iter));
-
-  gdk_rgba_free (selection);
-  pango_layout_iter_free (iter);
-}
-
-static GtkTextRenderer *
-get_text_renderer (void)
-{
-  static GtkTextRenderer *text_renderer = NULL;
-
-  if (!text_renderer)
-    text_renderer = g_object_new (GTK_TYPE_TEXT_RENDERER, NULL);
-
-  return text_renderer;
-}
-
-void
-gtk_text_layout_snapshot (GtkTextLayout      *layout,
-                          GtkWidget          *widget,
-                          GtkSnapshot        *snapshot,
-                          const GdkRectangle *clip)
-{
-  GtkStyleContext *context;
-  gint offset_y;
-  GtkTextRenderer *text_renderer;
-  GtkTextIter selection_start, selection_end;
-  gboolean have_selection;
-  GSList *line_list;
-  GSList *tmp_list;
-  cairo_t *cr;
-
-  g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
-  g_return_if_fail (layout->default_style != NULL);
-  g_return_if_fail (layout->buffer != NULL);
-  g_return_if_fail (snapshot != NULL);
-
-  context = gtk_widget_get_style_context (widget);
-
-  line_list = gtk_text_layout_get_lines (layout, clip->y, clip->y + clip->height, &offset_y);
-
-  if (line_list == NULL)
-    return; /* nothing on the screen */
-
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT(clip->x, clip->y, clip->width, clip->height));
-  text_renderer = get_text_renderer ();
-  text_renderer_begin (text_renderer, widget, cr);
-
-  /* text_renderer_begin/end does cairo_save/restore */
-  cairo_translate (cr, 0, offset_y);
-
-  gtk_text_layout_wrap_loop_start (layout);
-
-  have_selection = gtk_text_buffer_get_selection_bounds (layout->buffer,
-                                                         &selection_start,
-                                                         &selection_end);
-
-  tmp_list = line_list;
-  while (tmp_list != NULL)
-    {
-      GtkTextLineDisplay *line_display;
-      gint selection_start_index = -1;
-      gint selection_end_index = -1;
-
-      GtkTextLine *line = tmp_list->data;
-
-      line_display = gtk_text_layout_get_line_display (layout, line, FALSE);
-
-      if (line_display->height > 0)
-        {
-          g_assert (line_display->layout != NULL);
-          
-          if (have_selection)
-            {
-              GtkTextIter line_start, line_end;
-              gint byte_count;
-              
-              gtk_text_layout_get_iter_at_line (layout,
-                                                &line_start,
-                                                line, 0);
-              line_end = line_start;
-             if (!gtk_text_iter_ends_line (&line_end))
-               gtk_text_iter_forward_to_line_end (&line_end);
-              byte_count = gtk_text_iter_get_visible_line_index (&line_end);     
-
-              if (gtk_text_iter_compare (&selection_start, &line_end) <= 0 &&
-                  gtk_text_iter_compare (&selection_end, &line_start) >= 0)
-                {
-                  if (gtk_text_iter_compare (&selection_start, &line_start) >= 0)
-                    selection_start_index = gtk_text_iter_get_visible_line_index (&selection_start);
-                  else
-                    selection_start_index = -1;
-
-                  if (gtk_text_iter_compare (&selection_end, &line_end) <= 0)
-                    selection_end_index = gtk_text_iter_get_visible_line_index (&selection_end);
-                  else
-                    selection_end_index = byte_count + 1; /* + 1 to flag past-the-end */
-                }
-            }
-
-          render_para (text_renderer, line_display,
-                       selection_start_index, selection_end_index);
-
-          /* We paint the cursors last, because they overlap another chunk
-           * and need to appear on top.
-           */
-          if (line_display->cursors != NULL)
-            {
-              int i;
-
-              for (i = 0; i < line_display->cursors->len; i++)
-                {
-                  int index;
-                  PangoDirection dir;
-
-                  index = g_array_index(line_display->cursors, int, i);
-                  dir = (line_display->direction == GTK_TEXT_DIR_RTL) ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR;
-                  gtk_render_insertion_cursor (context, cr,
-                                               line_display->x_offset, line_display->top_margin,
-                                               line_display->layout, index, dir);
-                }
-            }
-        } /* line_display->height > 0 */
-
-      cairo_translate (cr, 0, line_display->height);
-      gtk_text_layout_free_line_display (layout, line_display);
-      
-      tmp_list = tmp_list->next;
-    }
-
-  gtk_text_layout_wrap_loop_end (layout);
-  text_renderer_end (text_renderer);
-
-  g_slist_free (line_list);
-
-  cairo_destroy (cr);
-}
diff --git a/gtk/gtktextdisplayprivate.h b/gtk/gtktextdisplayprivate.h
deleted file mode 100644 (file)
index e4385e5..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/* gtktextdisplay.c - display layed-out text
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000 Red Hat, Inc.
- * Tk->Gtk port by Havoc Pennington
- *
- * This file can be used under your choice of two licenses, the LGPL
- * and the original Tk license.
- *
- * LGPL:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Original Tk license:
- *
- * This software is copyrighted by the Regents of the University of
- * California, Sun Microsystems, Inc., and other parties.  The
- * following terms apply to all files associated with the software
- * unless explicitly disclaimed in individual files.
- *
- * The authors hereby grant permission to use, copy, modify,
- * distribute, and license this software and its documentation for any
- * purpose, provided that existing copyright notices are retained in
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * software may be copyrighted by their authors and need not follow
- * the licensing terms described here, provided that the new terms are
- * clearly indicated on the first page of each file where they apply.
- *
- * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
- * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * foregoing, the authors grant the U.S. Government and others acting
- * in its behalf permission to use and distribute the software in
- * accordance with the terms specified in this license.
- *
- */
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_DISPLAY_PRIVATE_H__
-#define __GTK_TEXT_DISPLAY_PRIVATE_H__
-
-#include "gtktextlayoutprivate.h"
-
-G_BEGIN_DECLS
-
-/* A semi-public header intended for use by code that also
- * uses GtkTextLayout
- */
-
-/* The drawable should be pre-initialized to your preferred background.
- * widget            - Widget to grab some style info from
- * snapshot          - Snapshot to render to, matrix set so that (0, 0)
- *                     is the top left of the layout
- * clip              - visible area
- */
-void gtk_text_layout_snapshot (GtkTextLayout        *layout,
-                               GtkWidget            *widget,
-                               GtkSnapshot          *snapshot,
-                               const GdkRectangle   *clip);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_TEXT_DISPLAY_PRIVATE_H__ */
index 79785773d1e4c66797f50b1679efabe7a96ecdc9..508aede41202f8735396d8d3c108c8927c65a395 100644 (file)
 
 #include "config.h"
 #include "gtkmarshalers.h"
+#include "gtkstylecontextprivate.h"
 #include "gtktextlayoutprivate.h"
 #include "gtktextbtree.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktextutil.h"
+#include "gskpango.h"
 #include "gtkintl.h"
+#include "gtkwidgetprivate.h"
+#include "gtktextviewprivate.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -3785,3 +3789,336 @@ gtk_text_layout_buffer_delete_range (GtkTextBuffer *textbuffer,
 
   gtk_text_layout_update_cursor_line (layout);
 }
+
+static void
+render_para (GskPangoRenderer   *crenderer,
+             int                 offset_y,
+             GtkTextLineDisplay *line_display,
+             int                 selection_start_index,
+             int                 selection_end_index)
+{
+  GtkStyleContext *context;
+  PangoLayout *layout = line_display->layout;
+  int byte_offset = 0;
+  PangoLayoutIter *iter;
+  int screen_width;
+  GdkRGBA *selection;
+  gboolean first = TRUE;
+  GtkCssNode *selection_node;
+  graphene_point_t point = { 0, offset_y };
+
+  g_return_if_fail (GTK_IS_TEXT_VIEW (crenderer->widget));
+
+  iter = pango_layout_get_iter (layout);
+  screen_width = line_display->total_width;
+
+  context = gtk_widget_get_style_context (crenderer->widget);
+  selection_node = gtk_text_view_get_selection_node ((GtkTextView*)crenderer->widget);
+  gtk_style_context_save_to_node (context, selection_node);
+
+  gtk_style_context_get (context, "background-color", &selection, NULL);
+
+  gtk_style_context_restore (context);
+
+  gtk_snapshot_save (crenderer->snapshot);
+  gtk_snapshot_translate (crenderer->snapshot, &point);
+
+  do
+    {
+      PangoLayoutLine *line = pango_layout_iter_get_line_readonly (iter);
+      int selection_y, selection_height;
+      int first_y, last_y;
+      PangoRectangle line_rect;
+      int baseline;
+      gboolean at_last_line;
+
+      pango_layout_iter_get_line_extents (iter, NULL, &line_rect);
+      baseline = pango_layout_iter_get_baseline (iter);
+      pango_layout_iter_get_line_yrange (iter, &first_y, &last_y);
+
+      /* Adjust for margins */
+
+      line_rect.x += line_display->x_offset * PANGO_SCALE;
+      line_rect.y += line_display->top_margin * PANGO_SCALE;
+      baseline += line_display->top_margin * PANGO_SCALE;
+
+      /* Selection is the height of the line, plus top/bottom
+       * margin if we're the first/last line
+       */
+      selection_y = PANGO_PIXELS (first_y) + line_display->top_margin;
+      selection_height = PANGO_PIXELS (last_y) - PANGO_PIXELS (first_y);
+
+      if (first)
+        {
+          selection_y -= line_display->top_margin;
+          selection_height += line_display->top_margin;
+        }
+
+      at_last_line = pango_layout_iter_at_last_line (iter);
+      if (at_last_line)
+        selection_height += line_display->bottom_margin;
+
+      first = FALSE;
+
+      if (selection_start_index < byte_offset &&
+          selection_end_index > line->length + byte_offset) /* All selected */
+        {
+          gtk_snapshot_append_color (crenderer->snapshot,
+                                     selection,
+                                     &GRAPHENE_RECT_INIT (line_display->left_margin,
+                                                          selection_y,
+                                                          screen_width,
+                                                          selection_height));
+          gsk_pango_renderer_set_state (crenderer, GSK_PANGO_RENDERER_SELECTED);
+          pango_renderer_draw_layout_line (PANGO_RENDERER (crenderer),
+                                           line,
+                                           line_rect.x,
+                                           baseline);
+        }
+      else
+        {
+          if (line_display->pg_bg_rgba_set)
+            gtk_snapshot_append_color (crenderer->snapshot,
+                                       &line_display->pg_bg_rgba,
+                                       &GRAPHENE_RECT_INIT (line_display->left_margin,
+                                                            selection_y,
+                                                            screen_width,
+                                                            selection_height));
+
+          gsk_pango_renderer_set_state (crenderer, GSK_PANGO_RENDERER_NORMAL);
+          pango_renderer_draw_layout_line (PANGO_RENDERER (crenderer),
+                                           line,
+                                           line_rect.x,
+                                           baseline);
+
+          /* Check if some part of the line is selected; the newline
+           * that is after line->length for the last line of the
+           * paragraph counts as part of the line for this
+           */
+          if ((selection_start_index < byte_offset + line->length ||
+               (selection_start_index == byte_offset + line->length && pango_layout_iter_at_last_line (iter))) &&
+              selection_end_index > byte_offset)
+            {
+              gint *ranges = NULL;
+              gint n_ranges, i;
+
+              pango_layout_line_get_x_ranges (line, selection_start_index, selection_end_index, &ranges, &n_ranges);
+
+              gsk_pango_renderer_set_state (crenderer, GSK_PANGO_RENDERER_SELECTED);
+
+              for (i = 0; i < n_ranges; i++)
+                {
+                  graphene_rect_t bounds;
+
+                  bounds.origin.x = line_display->x_offset + PANGO_PIXELS (ranges[2*i]);
+                  bounds.origin.y = selection_y;
+                  bounds.size.width = PANGO_PIXELS (ranges[2*i + 1]) - PANGO_PIXELS (ranges[2*i]);
+                  bounds.size.height = selection_height;
+
+                  gtk_snapshot_append_color (crenderer->snapshot, selection, &bounds);
+                  gtk_snapshot_push_clip (crenderer->snapshot, &bounds);
+                  pango_renderer_draw_layout_line (PANGO_RENDERER (crenderer),
+                                                   line,
+                                                   line_rect.x,
+                                                   baseline);
+                  gtk_snapshot_pop (crenderer->snapshot);
+                }
+
+              g_free (ranges);
+
+              /* Paint in the ends of the line */
+              if (line_rect.x > line_display->left_margin * PANGO_SCALE &&
+                  ((line_display->direction == GTK_TEXT_DIR_LTR && selection_start_index < byte_offset) ||
+                   (line_display->direction == GTK_TEXT_DIR_RTL && selection_end_index > byte_offset + line->length)))
+                gtk_snapshot_append_color (crenderer->snapshot,
+                                           selection,
+                                           &GRAPHENE_RECT_INIT (line_display->left_margin,
+                                                                selection_y,
+                                                                PANGO_PIXELS (line_rect.x) - line_display->left_margin,
+                                                                selection_height));
+
+              if (line_rect.x + line_rect.width <
+                  (screen_width + line_display->left_margin) * PANGO_SCALE &&
+                  ((line_display->direction == GTK_TEXT_DIR_LTR && selection_end_index > byte_offset + line->length) ||
+                   (line_display->direction == GTK_TEXT_DIR_RTL && selection_start_index < byte_offset)))
+                {
+                  int nonlayout_width = line_display->left_margin
+                                      + screen_width
+                                      - PANGO_PIXELS (line_rect.x)
+                                      - PANGO_PIXELS (line_rect.width);
+                  gtk_snapshot_append_color (crenderer->snapshot,
+                                             selection,
+                                             &GRAPHENE_RECT_INIT (PANGO_PIXELS (line_rect.x) + PANGO_PIXELS (line_rect.width),
+                                                                  selection_y,
+                                                                  nonlayout_width,
+                                                                  selection_height));
+                }
+            }
+          else if (line_display->has_block_cursor &&
+                   gtk_widget_has_focus (crenderer->widget) &&
+                   byte_offset <= line_display->insert_index &&
+                   (line_display->insert_index < byte_offset + line->length ||
+                    (at_last_line && line_display->insert_index == byte_offset + line->length)))
+            {
+              GdkRGBA cursor_color;
+              graphene_rect_t bounds = {
+                .origin.x = line_display->x_offset + line_display->block_cursor.x,
+                .origin.y = line_display->block_cursor.y + line_display->top_margin,
+                .size.width = line_display->block_cursor.width,
+                .size.height = line_display->block_cursor.height,
+              };
+
+              /* we draw text using base color on filled cursor rectangle of cursor color
+               * (normally white on black) */
+              _gtk_style_context_get_cursor_color (context, &cursor_color, NULL);
+
+              gtk_snapshot_append_color (crenderer->snapshot, &cursor_color, &bounds);
+
+              /* draw text under the cursor if any */
+              if (!line_display->cursor_at_line_end)
+                {
+                  gsk_pango_renderer_set_state (crenderer, GSK_PANGO_RENDERER_CURSOR);
+                  gtk_snapshot_push_clip (crenderer->snapshot, &bounds);
+                  pango_renderer_draw_layout_line (PANGO_RENDERER (crenderer),
+                                                   line,
+                                                   line_rect.x,
+                                                   baseline);
+                  gtk_snapshot_pop (crenderer->snapshot);
+                }
+            }
+        }
+
+      byte_offset += line->length;
+    }
+  while (pango_layout_iter_next_line (iter));
+
+  gtk_snapshot_restore (crenderer->snapshot);
+
+  gdk_rgba_free (selection);
+  pango_layout_iter_free (iter);
+}
+
+void
+gtk_text_layout_snapshot (GtkTextLayout      *layout,
+                          GtkWidget          *widget,
+                          GtkSnapshot        *snapshot,
+                          const GdkRectangle *clip)
+{
+  GskPangoRenderer *crenderer;
+  GtkStyleContext *context;
+  gint offset_y;
+  GtkTextIter selection_start, selection_end;
+  gboolean have_selection;
+  GSList *line_list;
+  GSList *tmp_list;
+  GdkRGBA color;
+
+  g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
+  g_return_if_fail (layout->default_style != NULL);
+  g_return_if_fail (layout->buffer != NULL);
+  g_return_if_fail (snapshot != NULL);
+
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get_color (context, &color);
+
+  line_list = gtk_text_layout_get_lines (layout, clip->y, clip->y + clip->height, &offset_y);
+
+  if (line_list == NULL)
+    return; /* nothing on the screen */
+
+  crenderer = gsk_pango_renderer_acquire ();
+
+  crenderer->widget = widget;
+  crenderer->snapshot = snapshot;
+  crenderer->fg_color = color;
+
+  graphene_rect_init (&crenderer->bounds,
+                      clip->x,
+                      clip->y,
+                      clip->width,
+                      clip->height);
+
+  gtk_text_layout_wrap_loop_start (layout);
+
+  have_selection = gtk_text_buffer_get_selection_bounds (layout->buffer,
+                                                         &selection_start,
+                                                         &selection_end);
+
+  tmp_list = line_list;
+  while (tmp_list != NULL)
+    {
+      GtkTextLine *line = tmp_list->data;
+      GtkTextLineDisplay *line_display;
+      gint selection_start_index = -1;
+      gint selection_end_index = -1;
+
+      line_display = gtk_text_layout_get_line_display (layout, line, FALSE);
+
+      if (line_display->height > 0)
+        {
+          g_assert (line_display->layout != NULL);
+
+          if (have_selection)
+            {
+              GtkTextIter line_start, line_end;
+              gint byte_count;
+
+              gtk_text_layout_get_iter_at_line (layout, &line_start, line, 0);
+              line_end = line_start;
+              if (!gtk_text_iter_ends_line (&line_end))
+                gtk_text_iter_forward_to_line_end (&line_end);
+              byte_count = gtk_text_iter_get_visible_line_index (&line_end);
+
+              if (gtk_text_iter_compare (&selection_start, &line_end) <= 0 &&
+                  gtk_text_iter_compare (&selection_end, &line_start) >= 0)
+                {
+                  if (gtk_text_iter_compare (&selection_start, &line_start) >= 0)
+                    selection_start_index = gtk_text_iter_get_visible_line_index (&selection_start);
+                  else
+                    selection_start_index = -1;
+
+                  if (gtk_text_iter_compare (&selection_end, &line_end) <= 0)
+                    selection_end_index = gtk_text_iter_get_visible_line_index (&selection_end);
+                  else
+                    selection_end_index = byte_count + 1; /* + 1 to flag past-the-end */
+                }
+            }
+
+          render_para (crenderer, offset_y, line_display,
+                       selection_start_index, selection_end_index);
+
+          /* We paint the cursors last, because they overlap another chunk
+           * and need to appear on top.
+           */
+          if (line_display->cursors != NULL)
+            {
+              int i;
+
+              for (i = 0; i < line_display->cursors->len; i++)
+                {
+                  int index;
+                  PangoDirection dir;
+
+                  index = g_array_index(line_display->cursors, int, i);
+                  dir = (line_display->direction == GTK_TEXT_DIR_RTL) ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR;
+
+                  gtk_snapshot_render_insertion_cursor (crenderer->snapshot, context,
+                                                        line_display->x_offset, offset_y + line_display->top_margin,
+                                                        line_display->layout, index, dir);
+                }
+            }
+        } /* line_display->height > 0 */
+
+      offset_y += line_display->height;
+
+      gtk_text_layout_free_line_display (layout, line_display);
+
+      tmp_list = tmp_list->next;
+    }
+
+  gtk_text_layout_wrap_loop_end (layout);
+
+  g_slist_free (line_list);
+
+  gsk_pango_renderer_release (crenderer);
+}
index 4a44731373cbdcfb1ca9f9edb322e6f613fafb1d..7ba6627b04ec66a79d592648acdc50d736d759fd 100644 (file)
@@ -113,6 +113,14 @@ struct _GtkTextLayout
   gint width;
   gint height;
 
+  /* Pixel offsets from the left and from the top to be used when we
+   * draw; these allow us to create left/top margins. We don't need
+   * anything special for bottom/right margins, because those don't
+   * affect drawing.
+   */
+  /* gint left_edge; */
+  /* gint top_edge; */
+
   GtkTextBuffer *buffer;
 
   gint left_padding;
@@ -137,7 +145,7 @@ struct _GtkTextLayout
 
   /* Whether we are allowed to wrap right now */
   gint wrap_loop_count;
-
+  
   /* Whether to show the insertion cursor */
   guint cursor_visible : 1;
 
@@ -389,6 +397,11 @@ void gtk_text_anchored_child_set_layout     (GtkWidget          *child,
 
 void gtk_text_layout_spew (GtkTextLayout *layout);
 
+void gtk_text_layout_snapshot (GtkTextLayout        *layout,
+                               GtkWidget            *widget,
+                               GtkSnapshot          *snapshot,
+                               const GdkRectangle   *clip);
+
 G_END_DECLS
 
 #endif  /* __GTK_TEXT_LAYOUT_PRIVATE_H__ */
index 19c2f7982d2f0d9c4e5123afb5985e61e68e1695..e806c6a205e2cecebd0f37e1ca5a60ede2820565 100644 (file)
@@ -27,8 +27,8 @@
 #include "gtktextview.h"
 #include "gtktextutil.h"
 
-#include "gtktextdisplayprivate.h"
 #include "gtktextbuffer.h"
+#include "gtktextlayoutprivate.h"
 #include "gtkmenuitem.h"
 #include "gtkintl.h"
 
index baaf8e4bff6eeeadcbfb9336105072193e41ba1b..73c85214559801bd4427d7e746f13fd20c6d5728 100644 (file)
@@ -41,7 +41,6 @@
 #include "gtkrenderbackgroundprivate.h"
 #include "gtkseparatormenuitem.h"
 #include "gtksettings.h"
-#include "gtktextdisplayprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtkimmulticontext.h"
 #include "gtkprivate.h"
index 428e1e49abffaf172bb38856500e664ccfb2efca..22fe73077fe0ad62374712525fde5ab4dbbb86a2 100644 (file)
@@ -366,7 +366,6 @@ gtk_public_sources = files([
   'gtktextattributes.c',
   'gtktextbuffer.c',
   'gtktextchild.c',
-  'gtktextdisplay.c',
   'gtktexthandle.c',
   'gtktextiter.c',
   'gtktextlayout.c',